Misc code formatting