Recombine similar functions

Doh!