minor simplification and correction