skin code cleanup