Remove unused namespaces and fix indenting