annotation mappings for getter and setter and minor refactoring