Code cleanup and minified.