scrubbed some magic numbers
cleaned up a couple of function descriptor comments