resolved some magic number issues