Consistency updates

Some minor consistency updates (indention, namespaces...)