changed logging
changed logging (test)
more code cleanup