cli cleanup and documentation