edited comments in attemt to improve readability
Merge branch 'general-refactoring' into develop