Refactor to improve code legibility
Concat and minify files