Structural improvements, cleanup, minified code.