Revert "Revert "minor syntax changes""

This reverts commit c4187f8874bc22549d070ea3a1b18df8ad5c6593.