Mild cleanup of pull request