Cleaned up some js
Merging