Refactorung - extracted like photo.