Coding standards tidy up