cleaned up includes and using namespaces