Refactored to use attr_reader