Optimization

Changed some code to provide a better base for minification and reminified with uglifyJS