Merge "skins: Minor code clean up"