Typos and cleaning