minor fixes, apply styleguide