Let defaults come from option parser's default value
Code cleanup