Refactoring Static to Class member