#15 review fixes