cleaned up the truly horrific methods names that I introduced in the last few commits