Nice seperated-out functions: does this make them more easily testable?