Fixed a logging level
Further cleanup
Small fix