Some cleanup per Anurag's review