Minor refactoring. Moving stop list to Helper object.