JS tidy, rename, and notices updated,