clean up the utils some