Some more overall clean up.