Little bit of a clean-up.
Some visual changes