Revert "Revert "Modernize some parts see description""

This reverts commit 591204d4c92794358b150d4ae0f3023e9173ed07.