Cleaned up utils