tidy warnings and imports