Remove magic numbers
Make a utility class

Make constructor private
Correct naming of constant