Better performance, little style change