just one style guide, move stuff around