replaced numbers with variables
cleanup