Typo
Remove trailing whitespace
Move the last piece of javascript in util.js