Refactored awful hop columns into collection object