Some Clean up, minor changes, and formatting.