minor refactorings in Saltr and LevelStructure