Some more edits for look