Tech Debt: Minor code clean up