Code cleanup, style fix (cpu)