- Cleaning up code adding constants and comments