Structure is cleaned up a bit.