Some JSHint tidying