Fix typos, remove redundancy