Optimization

Changes some code to provider a batter base for minification and reminified with uglifyJS