further style modifications; deleted commented-out code