(wip) refactoring @user to @current_user