Cleanup after review of my own code