Removing magic numbers