Making code more terse, clarifying some names.