Cleaning up and adding ICommand