Removed magic values