massive refactor
remove commented lines
Major Refactor
refactor