Cleaned up the source.