refactoring variously named references to current_user to  and added attributes and initialization to blocker