[a4y] Some code cleanup