minor format/readability changes ... drp