allow def in place of void
use def in place of void
more 'not' usage
clean up
clean up
clean up