continued refactor by updating imports