some changes
seperated JS