improve util classes