minor optimization
some optimizations
up Christophe's remarks