cleaned up and added utils and license