move some things back into methods