simplified per stephens code review