Code review by Rob, refactored, passing