Clean Sources

Reformat sources to conform to more modern code style.