Refactoring some member properties