Tidy resource usage and imports