imap: Minor code tidy up

Minor tidy up of code layout and comments following recent changes.