Cleaned up code and all but one on the design doc