Refactor syntax

JOIN ON - complete