scalastyles fixes