Extract Command Methods From Switch-Case in Controller

- Clean up and refactor Controller code
- Clean up comments on variables in Data