master
Refactored code