Some more code cleanup

josh wuz here