Code style and minify
better structure
ready for release