refactored after code review
Merge branch 'clean-scala' of https://github.com/vesin/fabut into clean-scala
refactored after code review