Refactoring of CPU