Refactored code
Merge branch 'feature-refactoring' into develop