Split the two parts of the entry comments for better layout control
Pre-branch for refactoring