Conform better to coding standards