Refactor Liegen (2)