Fixed import, and refactor issue

Fixed import, and refactor issue