Fix Whitespace
Refactor OMG