Configuration architecture review.
 - command line options override the configuration
 - use constant everywhere