Eliminating magic numbers
Merge