Refactoring variable
Small refactoring + using name
Improved error message
Added some TODOs for later