Lots of tidy up.

Lots of tidy up.