Cleanup doc comments a bit