add some NullPointerTester usage, small bits of cleanup