skins: Minor code clean up