All The Refactorings!!!1

Stuff. Also things.