Refactor Methods to allow overridding @command methods
#293
+98
−63
@command methods
#293