Tidy
JavaDoc
Get rid of CProperty