cmdlib: Cleanup public/private functions