refactred code
Merge branch 'refactor-smelly-code' into development
Merge branch 'development'