Clean up code, wrap-up sibling-level child container; small JSHint change