Feature/session snap code hygiene