Just realized you simply moved the property declarations; however, if you're refactoring, we might as well change the visibility.