simplify

siplifications by code reallocation