Remove need for passing current_user around
Remove unnecessary block
simplify checking only user