Change friend code triggers
Minor cleanup