minor refactor (clean up imports)