Refactor
Implement getter and setter