Cleaned up JS
Revised import column order