BF - Remove the use of the word "state" and replace with "cpu". Other small cleanups.