making the cops conform to expectations
Merge branch 'refactors'
even more style fixes