more refactoring towards immutability