Cleaned up the sources