Refactor code
Merge pull request #8 from KoombeaTraining/refactor_code

Refactor code