Cleaned up script.js
Merge branch 'adam'