Eliminating magic numbers++++