Styleguide conformance

and small crap I should have already changed.