skeleton refactoring