Clean up
Paper edits