Convert remaining controller code to use current_user

The `self.current_user` is important when assigning to the current user,
to avoid creating a local variable called `current_user`