Minor cleanup according to code review feedback