Minor refactoring
Minify