After friday code review