Some optimizations

Struggler · published · build 19286546

Some optimizations