Cleanup and better CLI