reformat code (JSHint errors, expand underscore code)