Style refactoring
Move that stuff out to a data namespace
Whitespace
Whitespace