fix implicit importing
clean a code.
done #41