Added further minifying