Refactoring of util classes