Smallest refactor [deploy snapshot]
Fix #462 [deploy snapshot]