format, removed warnings, some more use of Logger