Minor tweaks
Commands: Refactoring

--HG--
extra : amend_source : a605d6ae7470e09701968c84ea877a053661067e