minor syntax refactoring.