Fix formatting. All tests passing