Some last minute simplifications.