another commit

got rid of some magic numbers