Refactor

Add a couple tests that missed a subtlety (preservation of pre-existing styles) and refactor away some needless complexity