adapt previous commit with coding style
added ToDo