Improve some js