refactor method and remove scope
Merge branch 'FK34' of https://github.com/vinsol/freeka into FK34