a bit of syntax refactoring