styleguide and cleanup