clean up + simplification