All tests passing, and warnings removed