cleaning the code a bit and adding TODO list
small code cleaning