Fixed issues with codestyle guidelines.