typos and dead code removed