[Default skin] Code clean-up.