[NOJIRA] DRYing up controller logic
Merge pull request #914 from yuhunglin/NOJIRA

[NOJIRA] DRYing up controller logic