Style and efficiency updates to Comments