Refactored array / inner content handling