Some more JS style fixes