moving settings from direct instance variables; minor cleanup