refactor code, updated to lambdas and strings.xml #1

Closed ghost closed 3 years ago