8:09PM Clean up and minor revisions