Redundancies reduced.
Merge pull request #406 from catalan42/patch-2

Redundancies reduced.