Merge request

Refactored code