Clean Source

Reformat source to conform to more modern code style.