cleanup + typos