[Default skin] Code cleanup