Minor syntactic refactoring