Polished @dhellmann commits