Refactor considering Scalastyle report