Refactor CESyntax class