refactored and renamed properties