sbig-snap: small amount of refactoring/cleanup