Reformat some of this stuff
Better resolution parser
Better dropSpaces
Remove some more noise
Bit safer + some reformatting