* if /else cleanup