Cleaned some js
Merge
Better merge