typos and cleanup