remove clutter in project

hi, originally I just wanted to replace the magic numbers - decide for yourself if you like it.