minor updates for conciseness