Make JSHint happy
Some code comments for #641