Make changes per John's review