Hmu/french maid

Sorry for the name of this branch... clean_code already exists... :)