Little clarifying comment
Merge + cleanup