tidy imports, fixed #195