Addressing code review
Clearer attribute names
Better test