Lots of tiny code beautifications