made includes and namespaces consistent and pretty