Clean code
Code refactor
Merge branch 'develop'