Some more edits and clean ups