Refactor Relic for reduced method complexity