Todo clarifications and cleanup