Changes suggested by JSHint