code cleanup

That's it, one sweep through the whole codebase. (Ignoring stuff like nursery, which needs more of an overhaul than a cleanup)