Cosmetic corrections

Reverting some little past changes that are not necessary anymore.