removed namespace std from the headers and cleaned up some of the code