Minor edits and cleanup