little changes to assure consistency