More simplification
Moving stuff out
I'm on a roll refactoring
Less accept methods
Renames
Fix scope
Simplify code