Eliminating magic numbers++++++