Styleguide fixes + some little optimizations