[CODE REVIEW] Apply josdejong code review