we also cleanup the code so that defaults are specified only once, at the top of the file to ease editing