Clean up utils a bit