Edits and clean up