Clean Sources

Reformat sources to conform to a more modern code style.