typos + cleanup