Simplify imports