typos
code clean-up