Improve readability
Add getter and setter