Added more todo and a minor formatting