Indentation fixes and unused namespaces removed