Minor changes.
Re-structuring.