refactored the CommandsHelper suite