mostly style updates, also making accessors const