cleanup, change ranged to boolean