Some basic code cleanup.