Refactoring syntax