Updates after some feedbacks (thanks @brianstorti)