Import + Style cleanup