JSHint-inspired changes