Minor changes
Code refactoring
Merge branch 'develop'