Can't make up my mind about code style :)
Fixes after Scrutinizer check