Minor command code cleanup