First pass at some changes after initial code review comments.