Continued merging Affymetrix/Illumina

Also cleaned up and optimized code segments