Removed redundant splitting values containing a comma
Improved build