Improve code a bit.
Release 1.7.5.