Refactored commands in classes