Added getter&setter and refactored code