Cleanup, XML documentation