Refactored spots service and controller