code optimization: avoid regex engine as this is much more expensive than using split
Fixed wrong array name.
Merge branch 'reneeb-reneeb_efficient_by_class_reorg'