Remove superfluous comments and some typos