Small stylistic changes to CPU