Improvement based on feedback for CE1

Simplify commands in enum COMMAND_TYPE
Ensure spacing between functions.