Some refactoring in preparation for the default values of parameters.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>
Merge pull request #271 from ddobrev/def_vals

Some refactoring in preparation for the default values of parameters