removing magic numbers