CPUGuide: Code clean up a bit...
Bad? then revert it

Change-Id: I0ba47402ea26ce5b73010e46c74f18d4c4cee5b4
Merge branch 'bbq-1' into bbq