Deleted few stuff
refactored
refactored
changed