Close #94: Fix duplication in controllers