Removed all Magic numbers