Superficial edits and some cleanup