Refactorise all commands