Cleaning up command execute method
Adding new Replace class