refactor: change some spacing in code
Merge branch 'master' into developer