a bit of clean up (some related to #41)