unnecessary String.split() calls removed