Refactoring static fields ot non-static.