tiny modifications and cleanup to management commands
tiny modifications and cleanup to management commands