Cleans up webcomponents implementation, a bit