removed magic numbers... (sonar)