Typos and literal - cleanup