[#462] Update after code review