Slightly modified comment ordering