Explaining the good enough
Removing TODOs
Minor