Some styling tweaks based on Pull Request guidelines.