some more minor refactoring in constellation