Minor syntax changes. All tests passing