cleaning up, passing current_user to model