Complete recent pull requests to match house style