Added utils and clean some stuff up