Fixed missing code refactoring
Merge pull request #13 from xavismeh/develop

Fixed missing code refactoring