Typos and literals - cleanup