joelmcf Code cleanup.