Moved magic numbers into a constants object