starting refactoring to use Utility class, fixed weird imports