Add some documentation along the variables
Remove old set of comment, moved to the TODO list