fix #8: Issue8 - Fix the typos and legacy codes