Add missed wrapping
Extract drawing shots
Unify naming convention