Fix local and instance variables
Add getter method