Few improvements of previous commit