a bit of cleanup for issue 42