styleguide refactorings, more tests