skinning / refactoring