Minification improvement