Another round of code cleanup

hackety-hack