Cleanup - Fix indentation.
Bugfix  - Handle empty arrays.