Feature/fix remarks from review

Glad you like it :blush: