cleanup imports, refactor