Style fixes #2