some more styleguide refactorings