Scattered Refactorings

I'm doing these while I learn the codebase.
sets are unordered, should these plugins come in any specific order ? /cc @yakky