Added the suggestions made by the great @WouterJ