[TASK] Cleanup the code

- Remove the commented codes
- Cleanup the variables names