Cleaned up Sources processing