Refactor #current_user