Using config property more effectively

No reason to set properties for each option, simply pass the config object
around.