Conform to coding standards