simplify & clean up