Cleanups - now passes all tests