Code refractor

Fix typos