Code refactored to make it more clear for other contributors :kissing_heart: