[lo] code cleaning & clarification