minor fix  + clean code + set TODO