refactoring skeletons more