Cleanup: Cleaned up the util package