completed user review with tests, no refactoring done