remove "using namespace std" and cleanup headers