Reorganize some lines for readability