Bye Magic Numbers!

Small changes to get rid of magic numbers!