Individual, tested functions moved into an object