Quality: Update code for Scrutinizer & Insight suggestions