Skeleton refactoring