refactored away util package