cleanup util classes, add builder