Removed more magic values