Make static fields non-static, optimize