Refactoring of abstractions