Apply so cleanup suggested by JSHint