Fixed linting issues as shown by code climate.
Merge branch 'development'