Cleanup and nearly finish design