Addressed code review comments, see #3.