Began cleaning up the gibbot code