Refactored utilities package
Refactored utilities package