Clean up and other minor changes
Cleaup
….
Decreased verbosity a little.