Doc: two comments were swapped
Cleanup: refactoring