Feature/code hygiene

Code Hygiene for Session Snap