Cleaning up
Small edits