Code cleanliness updates per A's suggestions