Comply to coding standards