removed old commented code and changed headers