Remove magic numbers close #101