Editing and formatting clean up.
Cleaned up comments