Small Minification Refactoring