NU-01(hj): - Renamed constant to be more readable
- Renamed method to be more readable