fix import 'bug' + clean some code