revert previous change which leads to worse results.
Style.
Correct problem introduced with previous commit.
Add missing default constructor.