Refactoring : made fields private