sytle cleanup using scalastyle feedback