General minify and cleaning

General minify and cleaning