[snapbang] cleaning up main logic flow