Getters refactored. Variable names corrected