Refactor for clarity. Prepare to fetch/rm deps, not ready to deploy this in full.