xml/xhtml shoose improvement, code style tuning