Cleanup based on code review comments, see #44.