tidyng up based on feedback from PR