Updated to use minification friendly code.