Misc styling changes and general cleanup.