Removed magic constants for world size