Reviewing #7 pull-req; some suggestions