Clean up.
Updated,  made more cohernt.