Style fixes, should be no functional changes