removed some unnecessary code and renamed 2 files