Seperate setting for 'code' & minor changes