More work with comment readability