Cleaning up

Minor edits throughout