cleanup and small edits