Fixed several code style issues after Scrutinizer