GEOMESA-161 Made changes as per comments on PR