Coding standards

New PR because I don't feel like bothering AJF to pull minor changes
Sorry!