cleaning up a bunch, separating things into methods