type squish and magic number removal