Tidy up coding standards