Do some cleaning.

Add some color and move some stuff.