Refactored code UPDATED

forgot to add files to the prev commit