scalastyle and logging fixes