Started cleaning up/refactoring cpu definition