Clean code
Merge branch 'refactoring' of https://github.com/flulover/Bootcamp into refactoring