moving more things to helper methods