Refactoring clarity element