syntax refactoring.