Refactor Utilities Class