DRY up all of our code