Hard-core refactoring