Minor Changes.
Cleaning Up.