Minor refactoring and removal of Util class