refactoring
Merge branch 'refactoring-and-static-code-analysis' into self-made-encryption