closes #473 Address code review comments: mostly comment fixes, cleanup.