ocd

A few miscellaneous cleanup things. Whitespace, code after `return`, etc.