More removal of logger
More style checks