First refactoring over Command class.