Cleanup phpdoc/typehints/etc...