changes made as part of general cleanup
finishing up daily edits