Polished out some stuff.