Small simplification and comment cleanup.