Some cleanup work and comment fixes