Fix Whitespace
Move more coordinate logic into the coords namespace