Further linting
Updated for JSHint 2.0