fix white space, indentation and namespaces