Cleanup and small rename