Added code enhancements to be ready for minification.