Refactor/split up lifters controller