Cleaning up to coding standards