Refactoring: temporary solutions