cleanup + fixing typos