using the helpers in a few more places
finished refactoring helpers