Polished a little more