More comments and removing over-zealous current user check