Cleaning up CLI