Clean up todo, use documentation format for maximum green