after review optimizations