move function include to top
fix regexp
remove debug infos