Deleted .orig files
Refactored code to be easier to understand