Refactor imports