More JS style fixes / cleanup