Codestyle fixes
Inspections