Minor: remove whitespace
WIP Massive refactor