More cleanup + JSHint warnings