more syntax refactoring