[NOJIRA] DRYing up controller logic