refactored
removed unused code
removed insignificant features