Refactoring after Kernel Specs.