coding standards big tidy-up