Minor: indent, remove test code, don't use Any
Comment
Remove links to obsolete doc
Minor: inline property