Update CpuInfo.java

Massive cleanup. Found that combined works best.