Code clean-up.
Better styling.