Small cleanup in Command
Still cleaning position/location API