rather small refactoring on the skeletons