Addressed code review comments, did some other cleanup, see #26.