review by matthew

suggested changes implemented and tested