Consistent comments and add TODOs