Fix ConstructorInfo
Fix "Number" issue
Remove StringTokenizer occurrences