clean code + mock commands