Further minor style changes
Log levels cleanup