Assorted code style of latest commits