Modernize and cleanup
More cleanup