Refactored .utils package