Fixed typos and cleaning