Split redirect action checks into different functions