Code clean up
minor changes
Using "_domElement" in accessibility evaluation