Cleaning up + testing small & large values