Translation : Excluding variable names + added a @ToDo

Variable name fix (ToDo added)