Repo refactor; scrap distraction-free