Refactor, move syntax refinements to the beginning