clean up, add Util