Abstract conditional to descriptive method
Remove need for passing current_user around