Clean up and it passes my tests now