Refactored code
Improved logic code in check if operation should be performed
Final updates before tutor session
Push my changes after a messy git merge