Change some function signatures, removed some unnecessary clones