Fixing typos and improving style