simpler dom access
formatting
cleanup