Removing namespaces, cleaning code.