Style fixes and final cleanup