cleanup after pr review for util package checstyle refactorings