Rearranged and removed JS