skins refactoring