more refactöring