Cleanup and adding critic transform