Refactoring skel