Shuffle refactor in ApplicationController