Clean code
Add TODO:
Fix variable name
Fix conflict