Style fixes

See line notes!