Refactoring

Hi, welcome :slight_smile:

Related: