Cleared up magic numbers