Post PR code cleanups