Cleanup, minor improvements to Brent's