comment tidyup and remove log statements
update todo