Small simplifications & cleanups
Replace custom array rendering with builtin one