minor improvements of readability