Refactore syntax (use ordered list)