CPU Core cleanup

Just some cleanup work on the CPU core, nothing special.