cleanup and working CLI