Cleaned up. No leaks. Tests passing. Thumbs up!