Cleanup and revisions