Refactoring to make only public properties static