Cleaned up CLI