Adapted models to coding style guidelines.