Technical debt fighting week, round #2