Updated the format and cleaned up the namespace.