Various cleanup and optimization

2013-08-02, Edouard Tisserant