changes after code review with Benji