Some styling
A bit of styling
Changes from round of pull requests