Cleanup and more on the design doc