removed usage of StringTokenizer