Cleanup, correct typos