Removing magic values