NO-OP: whitespace and re-organization