Cleanup from my own review