refactoring: minor cleanup in utils classes