Move commands to enum and rename them
Add/improve some comments