Cleaned up the ICE part a bit.