removed some unnecessary clone()'s