Improvements after reading more related work
Handle TODOs in etatdelart