Cleanup and adding support for String on empty arrays