Cleaning up the sources. Still some work to do.