Fixed import, and refactor issue