bundling, js fiddling, cleanup