fix typo
remove unused code
fix #2 : add function maping