Cleanup commands section

Added more typing
Simplified usage