Refactoring
Merge branch 'master' into cleanup_dev
Formatting