Eliminating magic numbers++++++++