Remove unnecessary wrap options & optimize a bit