more cleanup, more styleguide