First cut of some cleanup and move to newer Java