Minor cleanup work, no functional changes