Minor refactoring
Finished the commands