Refactored current_user if statements