Small refactoring
Merge branch 'master' of https://github.com/NodeJS-Team-Anemoi/TeamworkProject