Small, smart changes

by Nicolas Solerieu