Avoid inefficient use of new String(String)
Use valueOf factory method instead of constructor
Add missing static modifier to inner classes