Mild refactor
Mild Minify