Code Cleanup

Minor command fixes