Tech Debt: more awesome polish