Cleaned up utils a bit