changes conform to Web Components Style Guide