Add static imports were possible. Remove wildcard imports. Replace Properties with Maps and URI with String. Misc improvements.
Add static imports were possible.  Formating changes.