Fix JSHint errors
Code review changes