Removed magic numbers
Sonar at 100%