Refactor Syntax Classes