a little bit of cleanup and tests are green: 23 run, 23 passes, 0 expected defects, 0 failures, 0 errors, 0 unexpected passes