Format doc comments
Removed todo