fix typos
initial
refactoring code