Final clean up of first draft