Fix imports to satisfy scala style rules