Improved configurability, readability, cleanup.