Eliminating magic numbers++