refactoring: replaced user instance variables with current_user