And comment cleanup here.