Another round of code cleanups